From 5d8e6d25d7c7e8e467928f99153095455b57d53c Mon Sep 17 00:00:00 2001 From: Rotem Liss Date: Tue, 16 Sep 2008 15:56:03 +0000 Subject: [PATCH] Localization: Split the delete, rollback and protect messages into three sections (no change in the text). --- languages/messages/MessagesEn.php | 78 ++++++++++++++++--------------- languages/messages/MessagesHe.php | 78 ++++++++++++++++--------------- maintenance/language/messages.inc | 10 +++- 3 files changed, 90 insertions(+), 76 deletions(-) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index d63f605865..c0390f78e6 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2241,58 +2241,62 @@ To change your watchlist settings, visit Feedback and further assistance: {{fullurl:{{MediaWiki:Helppage}}}}', -# Delete/protect/revert -'deletepage' => 'Delete page', -'confirm' => 'Confirm', -'excontent' => "content was: '$1'", -'excontentauthor' => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')", -'exbeforeblank' => "content before blanking was: '$1'", -'exblank' => 'page was empty', -'delete-confirm' => 'Delete "$1"', -'delete-backlink' => '← $1', # only translate this message to other languages if you have to change it -'delete-legend' => 'Delete', -'historywarning' => 'Warning: The page you are about to delete has a history:', -'confirmdeletetext' => 'You are about to delete a page along with all of its history. +# Delete +'deletepage' => 'Delete page', +'confirm' => 'Confirm', +'excontent' => "content was: '$1'", +'excontentauthor' => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')", +'exbeforeblank' => "content before blanking was: '$1'", +'exblank' => 'page was empty', +'delete-confirm' => 'Delete "$1"', +'delete-backlink' => '← $1', # only translate this message to other languages if you have to change it +'delete-legend' => 'Delete', +'historywarning' => 'Warning: The page you are about to delete has a history:', +'confirmdeletetext' => 'You are about to delete a page along with all of its history. Please confirm that you intend to do this, that you understand the consequences, and that you are doing this in accordance with [[{{MediaWiki:Policy-url}}|the policy]].', -'actioncomplete' => 'Action complete', -'deletedtext' => '"$1" has been deleted. +'actioncomplete' => 'Action complete', +'deletedtext' => '"$1" has been deleted. See $2 for a record of recent deletions.', -'deletedarticle' => 'deleted "[[$1]]"', -'suppressedarticle' => 'suppressed "[[$1]]"', -'dellogpage' => 'Deletion log', -'dellogpagetext' => 'Below is a list of the most recent deletions.', -'deletionlog' => 'deletion log', -'reverted' => 'Reverted to earlier revision', -'deletecomment' => 'Reason for deletion:', -'deleteotherreason' => 'Other/additional reason:', -'deletereasonotherlist' => 'Other reason', -'deletereason-dropdown' => '*Common delete reasons +'deletedarticle' => 'deleted "[[$1]]"', +'suppressedarticle' => 'suppressed "[[$1]]"', +'dellogpage' => 'Deletion log', +'dellogpagetext' => 'Below is a list of the most recent deletions.', +'deletionlog' => 'deletion log', +'reverted' => 'Reverted to earlier revision', +'deletecomment' => 'Reason for deletion:', +'deleteotherreason' => 'Other/additional reason:', +'deletereasonotherlist' => 'Other reason', +'deletereason-dropdown' => '*Common delete reasons ** Author request ** Copyright violation ** Vandalism', -'delete-edit-reasonlist' => 'Edit delete reasons', -'delete-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. +'delete-edit-reasonlist' => 'Edit delete reasons', +'delete-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. Deletion of such pages has been restricted to prevent accidental disruption of {{SITENAME}}.', -'delete-warning-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. +'delete-warning-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. Deleting it may disrupt database operations of {{SITENAME}}; proceed with caution.', -'rollback' => 'Roll back edits', -'rollback_short' => 'Rollback', -'rollbacklink' => 'rollback', -'rollbackfailed' => 'Rollback failed', -'cantrollback' => 'Cannot revert edit; + +# Rollback +'rollback' => 'Roll back edits', +'rollback_short' => 'Rollback', +'rollbacklink' => 'rollback', +'rollbackfailed' => 'Rollback failed', +'cantrollback' => 'Cannot revert edit; last contributor is only author of this page.', -'alreadyrolled' => 'Cannot rollback last edit of [[:$1]] by [[User:$2|$2]] ([[User talk:$2|Talk]] | [[Special:Contributions/$2|{{int:contribslink}}]]); +'alreadyrolled' => 'Cannot rollback last edit of [[:$1]] by [[User:$2|$2]] ([[User talk:$2|Talk]] | [[Special:Contributions/$2|{{int:contribslink}}]]); someone else has edited or rolled back the page already. The last edit to the page was by [[User:$3|$3]] ([[User talk:$3|Talk]] | [[Special:Contributions/$3|{{int:contribslink}}]]).', -'editcomment' => 'The edit comment was: "$1".', # only shown if there is an edit comment -'revertpage' => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from -'rollback-success' => 'Reverted edits by $1; +'editcomment' => 'The edit comment was: "$1".', # only shown if there is an edit comment +'revertpage' => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from +'rollback-success' => 'Reverted edits by $1; changed back to last version by $2.', -'sessionfailure' => 'There seems to be a problem with your login session; +'sessionfailure' => 'There seems to be a problem with your login session; this action has been canceled as a precaution against session hijacking. Please hit "back" and reload the page you came from, then try again.', + +# Protect 'protectlogpage' => 'Protection log', 'protectlogtext' => 'Below is a list of page locks and unlocks. See the [[Special:ProtectedPages|protected pages list]] for the list of currently operational page protections.', diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php index a82d52792c..7f7cd80163 100644 --- a/languages/messages/MessagesHe.php +++ b/languages/messages/MessagesHe.php @@ -1875,51 +1875,55 @@ $NEWPAGE למשוב ולעזרה נוספת: {{fullurl:Project:עזרה}}', -# Delete/protect/revert -'deletepage' => 'מחיקה', -'confirm' => 'אישור', -'excontent' => 'תוכן היה: "$1"', -'excontentauthor' => "תוכן היה: '$1' והתורם היחיד היה [[Special:Contributions/$2|$2]]", -'exbeforeblank' => 'תוכן לפני שרוקן היה: "$1"', -'exblank' => 'הדף היה ריק', -'delete-confirm' => 'מחיקת $1', -'delete-backlink' => '→ $1', -'delete-legend' => 'מחיקה', -'historywarning' => 'אזהרה – לדף שאתם עומדים למחוק יש היסטוריית שינויים:', -'confirmdeletetext' => 'אתם עומדים למחוק דף או תמונה יחד עם כל ההיסטוריה שלהם. +# Delete +'deletepage' => 'מחיקה', +'confirm' => 'אישור', +'excontent' => 'תוכן היה: "$1"', +'excontentauthor' => "תוכן היה: '$1' והתורם היחיד היה [[Special:Contributions/$2|$2]]", +'exbeforeblank' => 'תוכן לפני שרוקן היה: "$1"', +'exblank' => 'הדף היה ריק', +'delete-confirm' => 'מחיקת $1', +'delete-backlink' => '→ $1', +'delete-legend' => 'מחיקה', +'historywarning' => 'אזהרה – לדף שאתם עומדים למחוק יש היסטוריית שינויים:', +'confirmdeletetext' => 'אתם עומדים למחוק דף או תמונה יחד עם כל ההיסטוריה שלהם. אנא אשרו שזה אכן מה שאתם מתכוונים לעשות, שאתם מבינים את התוצאות של מעשה כזה, ושהמעשה מבוצע בהתאם לנהלי האתר.', -'actioncomplete' => 'הפעולה בוצעה', -'deletedtext' => '$1 נמחק. ראו $2 לרשימת המחיקות האחרונות.', -'deletedarticle' => 'מחק את [[$1]]', -'suppressedarticle' => 'הסתיר את [[$1]]', -'dellogpage' => 'יומן מחיקות', -'dellogpagetext' => 'להלן רשימה של המחיקות האחרונות שבוצעו.', -'deletionlog' => 'יומן מחיקות', -'reverted' => 'שוחזר לגרסה קודמת', -'deletecomment' => 'סיבת המחיקה:', -'deleteotherreason' => 'סיבה נוספת/אחרת:', -'deletereasonotherlist' => 'סיבה אחרת', -'deletereason-dropdown' => ' +'actioncomplete' => 'הפעולה בוצעה', +'deletedtext' => '$1 נמחק. ראו $2 לרשימת המחיקות האחרונות.', +'deletedarticle' => 'מחק את [[$1]]', +'suppressedarticle' => 'הסתיר את [[$1]]', +'dellogpage' => 'יומן מחיקות', +'dellogpagetext' => 'להלן רשימה של המחיקות האחרונות שבוצעו.', +'deletionlog' => 'יומן מחיקות', +'reverted' => 'שוחזר לגרסה קודמת', +'deletecomment' => 'סיבת המחיקה:', +'deleteotherreason' => 'סיבה נוספת/אחרת:', +'deletereasonotherlist' => 'סיבה אחרת', +'deletereason-dropdown' => ' * סיבות מחיקה נפוצות ** לבקשת הכותב ** הפרת זכויות יוצרים ** השחתה', -'delete-edit-reasonlist' => 'עריכת סיבות המחיקה', -'delete-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקת דפים כאלה הוגבלה כדי למנוע פגיעה בביצועי האתר.', -'delete-warning-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקה שלו עלולה להפריע לפעולות בבסיס הנתונים; אנא שיקלו שנית את המחיקה.', -'rollback' => 'שחזור עריכות', -'rollback_short' => 'שחזור', -'rollbacklink' => 'שחזור', -'rollbackfailed' => 'השחזור נכשל', -'cantrollback' => 'לא ניתן לשחזר את העריכה – התורם האחרון הוא היחיד שכתב דף זה; עם זאת, ניתן למחוק את הדף.', -'alreadyrolled' => 'לא ניתן לשחזר את עריכת הדף [[:$1]] על ידי [[User:$2|$2]] ([[User talk:$2|שיחה]] | [[Special:Contributions/$2|{{int:contribslink}}]]); מישהו אחר כבר ערך או שחזר דף זה. +'delete-edit-reasonlist' => 'עריכת סיבות המחיקה', +'delete-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקת דפים כאלה הוגבלה כדי למנוע פגיעה בביצועי האתר.', +'delete-warning-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקה שלו עלולה להפריע לפעולות בבסיס הנתונים; אנא שיקלו שנית את המחיקה.', + +# Rollback +'rollback' => 'שחזור עריכות', +'rollback_short' => 'שחזור', +'rollbacklink' => 'שחזור', +'rollbackfailed' => 'השחזור נכשל', +'cantrollback' => 'לא ניתן לשחזר את העריכה – התורם האחרון הוא היחיד שכתב דף זה; עם זאת, ניתן למחוק את הדף.', +'alreadyrolled' => 'לא ניתן לשחזר את עריכת הדף [[:$1]] על ידי [[User:$2|$2]] ([[User talk:$2|שיחה]] | [[Special:Contributions/$2|{{int:contribslink}}]]); מישהו אחר כבר ערך או שחזר דף זה. העריכה האחרונה הייתה של [[User:$3|$3]] ([[User talk:$3|שיחה]] | [[Special:Contributions/$3|{{int:contribslink}}]]).', -'editcomment' => "תקציר העריכה היה: \"'''\$1'''\".", # only shown if there is an edit comment -'revertpage' => 'שוחזר מעריכה של [[Special:Contributions/$2|$2]] ([[User talk:$2|שיחה]]) לעריכה האחרונה של [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from -'rollback-success' => 'שוחזר מעריכה של $1 לעריכה האחרונה של $2', -'sessionfailure' => 'נראה שיש בעיה בחיבורכם לאתר. פעולתכם בוטלה כאמצעי זהירות כנגד התחזות לתקשורת ממחשבכם. אנא חיזרו לדף הקודם ונסו שנית.', +'editcomment' => "תקציר העריכה היה: \"'''\$1'''\".", # only shown if there is an edit comment +'revertpage' => 'שוחזר מעריכה של [[Special:Contributions/$2|$2]] ([[User talk:$2|שיחה]]) לעריכה האחרונה של [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from +'rollback-success' => 'שוחזר מעריכה של $1 לעריכה האחרונה של $2', +'sessionfailure' => 'נראה שיש בעיה בחיבורכם לאתר. פעולתכם בוטלה כאמצעי זהירות כנגד התחזות לתקשורת ממחשבכם. אנא חיזרו לדף הקודם ונסו שנית.', + +# Protect 'protectlogpage' => 'יומן הגנות', 'protectlogtext' => 'להלן רשימה של הפעלות וביטולי הגנות על דפים. ראו גם את [[Special:ProtectedPages|רשימת הדפים המוגנים]] הנוכחית.', 'protectedarticle' => 'הפעיל הגנה על [[$1]]', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 1d9147ea9b..cd3c78b256 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1490,7 +1490,7 @@ $wgMessageStructure = array( 'enotif_anon_editor', 'enotif_body', ), - 'deleteprotectrev' => array( + 'delete' => array( 'deletepage', 'confirm', 'excontent', @@ -1517,6 +1517,8 @@ $wgMessageStructure = array( 'delete-edit-reasonlist', 'delete-toobig', 'delete-warning-toobig', + ), + 'rollback' => array( 'rollback', 'rollback_short', 'rollbacklink', @@ -1527,6 +1529,8 @@ $wgMessageStructure = array( 'revertpage', 'rollback-success', 'sessionfailure', + ), + 'protect' => array( 'protectlogpage', 'protectlogtext', 'protectedarticle', @@ -2821,7 +2825,9 @@ XHTML id names.", 'watchlist' => 'Watchlist', 'watching' => 'Displayed when you click the "watch" button and it is in the process of watching', 'enotif' => '', - 'deleteprotectrev' => 'Delete/protect/revert', + 'delete' => 'Delete', + 'rollback' => 'Rollback', + 'protect' => 'Protect', 'restrictions' => 'Restrictions (nouns)', 'restriction-levels' => 'Restriction levels', 'undelete' => 'Undelete', -- 2.20.1